Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Regrid main merge master #236

Merged
merged 77 commits into from
Jul 8, 2022
Merged

Regrid main merge master #236

merged 77 commits into from
Jul 8, 2022

Conversation

sol1105
Copy link
Contributor

@sol1105 sol1105 commented Jul 4, 2022

  • What kind of change does this PR introduce?:
    It just merges the master branch into the regrid-main branch.

Eleanor Smith and others added 30 commits December 16, 2021 13:31
add initial average_time functions
0157cab
add more tests for average time
ffad882
merge master
1231a5f
update exception message
645f4c1
update history and docs
a07ce68
add time bounds and test for them
baf1b81
move creation of time bounds to separate function
c16e787
change exception
53860d0
@Zeitsperre
update pre-commit and requirements
8ae6935
@Zeitsperre
first draft at fixing the logging - removed logging.conf, remove a cl…
d055589 
…isops self-import, used relative location loggers, removed unused imports
@Zeitsperre
add a logging test, remove references to Travis CI
e469399
@Zeitsperre
remove duplicate call to pytest in setup options
eb92d2e
@Zeitsperre
full reimplementation with loguru
d9b4ab8
@Zeitsperre
add loguru to environment.yml
7615f93
@Zeitsperre
pin pandas below 1.4
aa4278d
@Zeitsperre
add some colour to tox readout
a2c1037
@Zeitsperre
fix folder discovery test
31c9839
@agstephens
Merge pull request #211 from roocs/average_time
d7c3d7a 
Average time
@Zeitsperre
Merge branch 'master' into logging_adjustments
80565d3
@Zeitsperre
Adjustments to loguru
b0595fe
@Zeitsperre
pre-commit adjustments
0e1283a
@Zeitsperre
use py37 conventions
2b53249
@Zeitsperre
use py37 conventions
efa838c
@Zeitsperre
update pre-commit with newest versions of libraries and use py37+ con…
3b7f6d3 
…ventions in black and pyupgrade
@Zeitsperre
add pytest-loguru
76f62d6
@Zeitsperre
add pre-commit CI hook
ea9c41b
@Zeitsperre
try using mamba to reduce RAM usage
2677889
@Zeitsperre
pin pandas below v1.4
7ae22e3
@Zeitsperre
Update HISTORY.rst
6c89b80
@Zeitsperre
try using mamba to reduce RAM usage
08aee79
Zeitsperre and others added 22 commits May 27, 2022 14:59
@Zeitsperre
Fix broken notebooks alias
8511f4e
@Zeitsperre
Fix conf.py error that prevented notebooks from rendering in RtD
eabe71c
@Zeitsperre
rename some sections that were conflicting in notebooks, adjust some …
65eeb3c 
…function docstrings that were malformed, fix sections heading underlines that were too short, fix code-blocks that were malformed, use autosectionlabel options to prevent errors in HISTORY.rst
@Zeitsperre
Set ReadTheDocs to fail on warning
b3b528c
@agstephens
Merge pull request #232 from roocs/fix_notebooks_symlink
0a867ac 
Fix broken notebooks aliases and address all docs warnings
@pre-commit-ci
[pre-commit.ci] pre-commit autoupdate
0bf8e94 
updates:
- [github.com/pre-commit/pre-commit-hooks: v4.2.0 → v4.3.0](pre-commit/pre-commit-hooks@v4.2.0...v4.3.0)
- [github.com/asottile/pyupgrade: v2.32.1 → v2.34.0](asottile/pyupgrade@v2.32.1...v2.34.0)
@Zeitsperre
Retire Python3.7, add support for Python3.10
e7b708b
@Zeitsperre
Python3.7 needed for RtD
4da414a
@Zeitsperre
adjust tox builds
5cb3368
@Zeitsperre
new sphinx requires explicitly set language
32a779d
@Zeitsperre
update HISTORY.rst
2fda6b8
@Zeitsperre
use newer readthedocs build image
5dae75e
@Zeitsperre
Merge pull request #234 from roocs/drop_python37
2ce1594 
Retire Python3.7 and add support for Python3.10
@Zeitsperre
Merge branch 'master' into pre-commit-ci-update-config
096be7e
@Zeitsperre
Merge pull request #233 from roocs/pre-commit-ci-update-config
b9db2c8 
[pre-commit.ci] pre-commit autoupdate
@Zeitsperre
do not build epud
918e3c4
@Zeitsperre
Modify xarray module path in documentation for nicer type hinting
041ab84
@Zeitsperre
Merge pull request #235 from roocs/hotfix_drop_epub
eda6639 
Do not build EPUB on ReadTheDocs
@sol1105
merge master
afc4caf
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
7b83753 
for more information, see https://pre-commit.ci
@sol1105
Edit import order core/__init__.py
2aad0e4
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
b57083e 
for more information, see https://pre-commit.ci
@sol1105
Copy link
Contributor Author

sol1105 commented Jul 4, 2022

@cehbrecht @Zeitsperre

pre-commit auto "fixes" the import order in clisops/core/__init__.py: LINK
This however reintroduces the weird segmentation fault from this already resolved issue: #183

What to do about this?

Also, the conda-xesmf section in the CI does not test anything xesmf related, since all xesmf-imports in the tests fail with could not import 'xesmf': Numba needs NumPy 1.21 or less. The requirements for numba seem not to be taken into account when solving the environment. We can manually add it to the environment.yml (however, for me then one test fails). I just mention it here cause it seems to have been overlooked in the latest PRs.

@Zeitsperre
Copy link
Collaborator

Zeitsperre commented Jul 6, 2022 •
edited
Loading

@sol1105

Sorry to be late getting back to you. I can push some changes that skip the import sorting on that particular file.

I'll also take a look at the conda-xesmf CI issue. Should be a relatively simple fix.

Your solutions are exactly what was needed. Sorry again!

@sol1105
Copy link
Contributor Author

sol1105 commented Jul 7, 2022

@Zeitsperre Thanks for getting back and approving the changes :)

@sol1105 sol1105 merged commit cb5333c into regrid-main Jul 8, 2022
@sol1105 sol1105 deleted the regrid-main-merge-master branch July 8, 2022 12:46
@sol1105 sol1105 mentioned this pull request Aug 17, 2022
Merged
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@sol1105 @Zeitsperre @agstephens @cehbrecht